Reformatted Gemfile, more work on model
Cleaning up controller