started working on session handling