Began implementing prop->value map again