half implemented session
resolved login merge conflict
more session implementation