move more stuff into sessions