Battle stuff

Working on testing and debugging the battle system.