Session Refactor Complete