Just adding a couple of TODO comments to code.