Specs are passing
Refactor I