Intermediate: trying to fix shooting bug

Intermediate check-in. Further attempts to fix the shooting bug. Not
much success. About to starting tracking Sam with states.