Pulled the upstream todo into a separate file