Sounds like a good plan that needs to be implemented sooner rather than later.
Isn't this one of the reasons the Knights were created?  Make it so Knights.