Moved datasource download to where it might do us some good