Added groundwork to support multiple simultaneous categories for riders.