Beginning to move Database logic into the Database class for seperation of concerns.