Refactored the code a bit
Added the progress callback to the Loader (and tests)