Far from clean but need to be saved
Cleaner
Before playing with heroku