I really hope this show also goes all in on Montoya, for she is awesomeness in all her identities.