WIP
WIP
Merge pull request #579 from ContinuumIO/session_refactor_hugo

Session refactor hugo