WIP. Currently working on making changes to lifetime management of the sessions and to properly handle exceptions.
WIP. so we can sync branches
Merge branch 'jason'