Refactor session logic into its own hook

Refactor session logic into its own hook #932