Total rework of racing app