More refactoring
Even more refactoring
Save before major design change using decorators
More design changes - decorator implemented
More design changes - decorator implemented
More refactoring thanks to Codeschool