^Oh, definitely. It's one of my greatest regrets that Sol Kaplan only scored two TOS episodes. His work was fantastic.
(One of my other greatest regrets, if anyone's interested, is that "A Piece of the Action" was stuck with a stock score. Just imagine if Fielding or Fried, say, had gotten to do a full, jazzy original score for that one.)