Spoke to Matt about this. He is going to insert the TODO to work on that on later days.
Once that's done, this change is approved.