Converted to use side-by-side editing (for now)