Feature/progress indicator