Add progress bar and refactor