Update to work with new binding.EditWindow (WIP)