Added the Database and DAO.
Removed Database due to errors, will add Database and DAO back in on next commit.