It would be good to do this now so we don't merge TODOs into master in the main repo.