Added documentation
Moved some stuff into the model
Merge branch 'master' of heroku.com:mighty-sands-9787