WIP: More work on block editor.