Tried to get shunting working. Failed. Will try again.

Rolled back and cleaned up so that there are no warnings.