Progress bar works - prelim
Merge conflict