Actual check mock up
Move tasks to Scheduler. Add some error checks