Either Kalinda or Kat for katherin, as far as I know. 

Dizzy is asleep, right, so griffin can't fight kijani yet lol