Refactoring
Add RaceTrack Behaviors
Merge