redoing session stuff
close off this branch