continued work on battle class