Session Listing Almost Refactored