Added TODO for moving session/socket integration