Work towards implementing the Database