LF-13525 - Edit support

Going to undo these changes. Didn't mean to check them in with the actual code bits.