Started the work for proper progress reporting
Some more output cleanups
Remove implemented TODO item
Completed progress rework