More attempts at the logic for API permissions, most likely will need continued tweaking in the future, but base is there.