More work on the editor.  Added placements and marks.