Attached is the new version I plan to push this evening. Last call for comments!