Wip 9173

Yes, these were 4 for add/remove and copy-pasted to touch without thinking.  Bumped them all down to 10 now, as I think we get most of the information at level 3/4 anyway from handle_client_session etc.