Database-class should now be compleate