Adds TODO for this refactor

[skip ci]