Skill shots

I haven't written tests, so don't delete this branch after merging. I will create the tests next week. Any other code changes, however, I will try to change before today at 5 oclock.