Add some TODOs for session state