Fix heroku problem
Fix everything else
Fix everything else
Add new data