Still needs a bit more work in discussion, but most of the changes Dan and I talked about this morning have been implemented