Started adding cannon tracking