WIP: Block editor is looking good. Now for other changes.