WIP rebuilding ObservableProperty