Universal Daos should be functional, though untested.
A bit of refactoring too, plus updated SQL files