Reviewing the TODO, making some changes.