major refactoring

fixes #3

task report to be refactored