WIP on supporting track order. Not working.