Resolved #13 - independant tasks from definitions.