Have added more TODOs, mapped out repositories to remotes in default.xml