Session class changes -- Doesn't work, doesn't include other changed files yet.