Commit changes to allow merge
Merged remote and local
Completed refactoring of downloads