Quota possibly overcomplicating, need sanity check?