I see your point.  I'm fine with getting away from ```Routes``` but can we tackle that as a separate PR as they are currently all over the place?