Add TODO notes for how to make the logic cleaner