v1.1 - added editors, fixed up a few classes.