End of class, refactored for better MVC orientation
spilled more vino
ready for heroku