WIP Refactor
Finish OO 01-01