Editor Changes

Give this a good test.  There is a lot that changed here.