Actually, I just left this for the time being. This will all change when I get rid of the downloader factory.