back to the drawing board, session implementation needs to be reworked [ci skip]