Route dev

Hey Andrew,

I actually have a cold so even changes this small may be a bit wacky so do feel free to ignore this for a while until I convince myself they are sensible.

The first commit addresses wookie issue #45, the second #44 and the third is just an optional tidy up.

Cheers,

Greg