done single session support
1st passing test for one session
working in one session