Made more progress on setting up classes for the database