General refactor to allow better management of selection between tracks.