Initial changes around text editor.  Committed early to ease integration.