New block editor mode

This is the big merge to pull in the new block-based editor, ICE.