Tidy up a bit
Implement SingleTrack

Fixes #