All code fixes to do with the rewrite of stop project can be found on the `rewrite` branch (here on GH)