Restructure torii hooks

@jweakley Please review. This change also expects the user to be included in the serialized session. After this is :+1:, we need to publish it.

-Sam