7.1 and 7.2 done, minor additions (collaborative session)