#27 More changes implementing the new Session architecture.