Evolution to 2.2

The biggest changes are in the sessions.