Added editable points, restructure