Getting rid of this whole editing block would be nice, right ?