Timer

Timer, relationships, factory girl, bug squashing