Stuff to need to move up to heroku - might not work