WIP: Continuing work on block editor.