More decoupling

Still trying to decouple message processing from the sessions