More scaffolding in place for sessions; not usable yet