Got simple sessions working
Merged with master