WIP: More block editor work.