Almost finished the combat stuff