Added Cannon.nofire support
Added 8-1

7-4 will be tricky...