Put parameter on DAO object for returned types (lots still to clean
up.)  Fix linking/relationships a bit, but again, more to do.