Updating to a simpler DAO setup

Much like what is found in tregmine