Continuing refactoring to how our DAOs work