Worked on session and client classes, tests use those now aswell