Use progress parameter as callable
Flailed attempt at cleaning up progress tracking

Not really improving things a lot...
References #5