Quick dirty test why is heroku not working?
Some tidying up of model stuff and more debug code