More logic to get autonomous drive task closer to working...