committing Ivan's changes for session in a manual merge since we both added intermediary pages that would conflict. This was the easier way.