Updated property bindings, but broken atm