Updated tests and what not
Made method for the battle, it mostly works
need to add tests for each piece to get code coverage