According to The Hollywood Reporter, Rainbow Johnson’s brother in Season 3 of Black-ish will be an annoyance to Dre Johnson because of his coddled upbringing; he also happens to have at one point been both the Marquis de Lafayette and Thomas Jefferson. For it’s been announced that Tony winning Hamilton star/exceedingly dextrous rapper Daveed Diggs (Lin-Manuel Miranda once commented about writing certain challenging raps because he “knew [he] had Daveed”) will be joining the show for a Season 3 arc as Johan, the brother of Tracee Ellis Ross’ character.

Since leaving Hamilton, the actor (also the lead vocalist for clipping.) has lined up a couple of high profile projects, starting with a role in Baz Luhrmann’s upcoming musical drama The Get Down, about a group of teenagers in the South Bronx in the 1970s during the dawn of hip-hop, and the film Wonder, in which he’ll appear alongside Julia Roberts, Owen Wilson and Room‘s Jacob Tremblay.

Watch him on The Tonight Show: