Further updates to get initial binding working