Initial routing changes.

Brad,

  These are the changes I wanted you to look at.

Cheers,
Brad