Started to add the combat