Add TODO comments

Checking things rather than assuming them.