Inital Heroku push
Heroku errors
Clean up code, optimize some queries