Beginning work on getting the AI to actually fight.
Fix merge