Refactoring done, progressbars added.