First version that compiles for the new location tracking.