Ongoing work...
Refactoring continues...