Final commit before Heroku push and code freeze