Rough progress output working
Moved progress printing to output.{h,c}