Begin req 2.6 and 7.1 (with bugs)