The objective is to address the architectural (e.g., centralized) and feature (e.g., undo) limitations of the state-of-the-art collaborative editing systems. We have implemented a collaborative editing sub-system in Emacs with a layerd CRDT (Conflict-free Replicated Data Type) that can run without central servers and support advanced selective undo.