WiP moving session mgt into Adapter