Worked on the Database class a little