Some work on the property editor.