Refactored model, database access classes and unit tests complete, started work on manager classes