Finish initial version of sessions