Lots more work in progress on the router refactoring and the use of operationcontexts everywhere.