Intermediate Commit - Continuing to transition to OOP