WiP on moving session duties to Adapter