Add TODO comments to modules which are clearly messy but won't get done in v3