moved shopper stuff out of zvents to events
merge conflicts