first pass service properties editor
Merge branch 'peditor'