Not sure if this needs to be documented.
Get rid of the TODO