What started as adding the drinkers manager / dao turned into a major cleanup