Working on the combat sys more