#386 Finish up tasker additions