Rather than snap the fuel wagon etc into place, I've decided to sort of increase "friction" when it's lined up correctly, so that the train wants to slow down. Let's see how this goes. First basic version here.