As we add TODOs for things related to the engine work, I'd recommend including 'ENGINE' in the comment (e.g. # TODO: ENGINE: ") .  That way we can easily find those that are related to this effort.