Added in a simple hack/fix to Task. Everything still needs to be tested, but it all seems to be working.