iD editing

References #128