added DAO, discovered problems with testing - see BaseDAO for details