progress.py using property
progress fixes
progress added to output area
Fix progress.py bad merge