Edit: split out stun into a method, and cleanup the args handeling a bit