Spoilerish..
If Klaw, wouldn't he be the enemy of Black Panther? Teams up with Ultron in the comics too.
http://en.wikipedia.org/wiki/Klaw_(Marvel_Comics)
EDIT: nevermind, misread what you said. Yes, if Klaw is involved, there has to be a lead in to Black Panther.