Refactoring & Progressbar started.