[KLS]

Throw a diff on submissions and I'll commit it with the rest of this combat stuff I'm finishing up(if no one else does first)