chapter 9 up until listing 9.7 (no settings link yet set)
Merge branch 'update-delete'