Introduce a simple progress indicator
Get the tests passing again
Merge branch 'progress-indicator'