not really progress bar stuff.  Going to merge with master