models and controllers and all specs funcioning and refactored