started refactoring session server
fix flipped conditional
Merge branch 'enhancement-session-server-refactor' into develop