Finished up session class rework and testing