Implement Cannon-shot/health and persistence
Merge