Finished most everything, I think I can push to heroku now