Reverting some of previous commit in the inital download & changing some of the prioritisation around