Move track xpath code into waitsfortrack
WIP removing sleeps