Added combat-tst with limited initial testing. Made a few changes on
combat such as removing unnessasary functions and tweeking existing
functions.