#13 Shot function merge request

This is another shot function commit. I had to delete my repo and then
re-clone. Hopefully this works