Begun writing the new quick_combat tool