Done with almost everything, next -> pushing to heroku