Changes to DB class and progress towards a finished DB class