Began rewrite of RaceHandler