Lots of changes to DrinkInterface and DrinkDb. Lets see whats broken!