[dannunzio] rewrote the session spec a bit