Fully implement Organisation Sessions, add TEACHER labels