TODO's should not be in the pull request, they should all be resolved.