Bunch of changes to get things setup for custom binding work