Starting to work towards per-session modes