Added progress bar, minor testing.