Cup Fixtures

Add logic to allow cup fixtures to be drawn