refactor a bit, attempt heroku deploy