Prepared for fully implementing starting download at a later date
Optimized code
Fixes #4