Various changes to add ability to edit blocks