are you planning to fix this?  or leave this TODO bits which I've commented about before you refactored this?