repopulate DB with new spacing, refactor DAOs