passing tests
change gemfile
Massive refactoring