BAI: Now the decorator is really general purpose.