Session refactor hugo

@bryevdv