feature complete
Merge branch 'editable-input'