There are a few TODO comments like this one sprinkled throughout the code.  We will need to get rid of them.