first pass beers and fries
in the bus
manually merging with master