Move parsing into parser and retask RideGenerator