Add session management



<!---
@huboard:{"order":568.185546875,"milestone_order":691,"custom_state":""}
-->