Doing my new draft of the OOC now.