Some (unfinished) changes to setting/removing/updating