Shocker or Tinkerer?

Two new villains are confirmed for Spider-Man: Homecoming. Gotta feeling he is one of them. What do you think?