Continued drafting work, looking for comments now