Feature/advanced progress bar

https://www.pivotaltracker.com/story/show/63138698