Did some more work on task override