More annotations. Need to add annotations to 'set' and 'setInv' portions.