Work on design, add RaceBundle