Working on the session manager and other edits
Merge pull request #27 from dubdabasoduba/feature/EMR-7

Working on the session manager and other edits