Reworked many elements following discussion with Paul and Francis.