add sessions stuff
mege conflicts