refactoring
MOAR REFACTORING
Merged refactors with Cory, updated Gemfile