Heroku commit
Unblocked localhost
Final commit of the night