More work on Sessions...