WIP implementing initial download feature