-Lots of clean-up re-organization of session info
-Re-organization not complete so some things are broken