There's a simple solution: 2 liter bottles and a glass

Still has the corn syrup problem. I should install my soda fountain.