Start over, focus on the flexibility of what a Job and Task can do.