Heroku no.
Finished refactoring. Specs pass. Fixes #12