Work-in-progress: use progress bar