Revert "removing TODO as this is the correct way to do things"

This reverts commit cac2b98379179adb37a374eca5a99d19f52687c7.