Lots of untested work on battles
Added details to battle
Battles seem to work YAY