Update Marty's general gun-related ideas

UPDATED: 06DEC14