working on OO
OO complete, fixed some controllers
Merge pull request #4 from CoolJorcz/oo

OO