restructuring again after talking with @dajbelshaw. Also changed wording - unit to session