Started the Object Oriented refactoring