Basic functionality finished - push to heroku