Refactoring

Lots of broken RSpecs