Shuffle DAO methods around a little more