Major changes in Drinkcabinet
Merge...
Merge.. i think