working on about 90% of the tracks in my new, larger test bed, just need some more tweaking to get round the really horrible ones