Continuing to re-implement DAO + util
Revised the most complicated query to use the new tables.