Added some data binding. See notes