Making objects more modular and bug fixes
Renamed download to collect