progress bar as shared partial, tried to move progress calculations to model instead of controller/view
merge conflict