initial commit
session support  code
conflict