Added session class
!!! SHOULD BE THOUGHT OVER MORE
Merge branch 'temp'