Continued work on sessions