refactored to common package, progress on the job/task handling by master. TODO refactor to listeners where possible