Refactors and stuff I need to test on heroku specifically.