Swapped drinks controller and model logic