add progress
fix conflicts
Merge branch 'implement_tagging'

 Push-pull screw-up.