More sweeping changes to binding, broke box grids :-(