Editoring

Much happen.

I am still working on fleshing out unit tests, but this is ready for testing in the large.