Added track selection, is not instantaneous so must be worked on.