Last commit before heroku-ing