Made a few edits, this is ready for the meeting