Initial work towards separating out daos