Got it, makes sense, thank you. I'll remove TODO.