More prep-work for moving to a single track type...