WIP: started improvement of data binding. Commented out some diagnostic logging that should be removed anyway.