Add IsShot
Add shot implementation
Merge remote-tracking branch 'origin/gui' into gui