continued work on Combat class