Rework multi-client support. Allow any client to be the first request.

Remove the sub-context stuff - it doesn't work. Need a different approach