Fixed overwrite using ATfunction from modal branch to properly call taskStatus functions
Fixed merge overwrite
merged master again and resolved conflicts