Added a progress bar but haven't tested