Updated groupon payment for embedded Price Option
Sliced generic methods into top level class
Switched to fully embedded PriceOption holder