Added TODOs, taking Andy's comments into account.