Updated version as of the end of the meeting today - ready for write up!