Cleaned up some more but we need to figure out some reuse in the Downloaders will be a copy paste fest if not