wip. worked on the session system