Next bunch of changes on the drafting. Still needs a serious run-through to clean up the loose ends, but we're getting there.