Fixed crtieria for tasks.
Moved existing charts over to Chart.js