changed a few things and added Battle method