working on dao, adjusting related classes