Add basic progress bar. Various clean up refactorings.