master: DAO sketched out. Tried to clean up imports and query structures, but this will be an evolving thing.