WP2
Merge branch 'master' of https://github.com/oxr/hdtt230712
Outline for WP2 following the notes made on the black board