Testing pushing to heroku
Implemented a lot of changes, as of this point all working correctly