Closes #126 - Progress calculation