Intermediate commit, working on DAO classes