More refactoring, more SQLDaos added for home. Tests passing