Donald Trump is campaigning as a general election candidate at this point.

Continuing a pivot that began with an uncharacteristically dignified news conference after Tuesday’s New York primary victory, the GOP front-runner was clearly going for broad appeal during a town hall event Thursday on the “Today” show. He downplayed his earlier, more strident rhetoric as the work of an "entertainer," suggested a currency compromise that would allow Andrew Jackson to remain on the $20 bill while putting Harriet Tubman on a new denomination, and talked about raising taxes on the wealthy while making sure to say that most bankers are good people.

Perhaps most notably, as our Jose DelReal reports, he stepped out of line with many Republicans in opposing North Carolina’s new bathroom law that requires transgender men and women to use public restrooms that match the physical anatomies with which they were born, rather than the genders with which they identify.

"North Carolina did something that was very strong, and they're paying a big price, and there's a lot of problems," he said in response to a question that had been submitted by a voter on Twitter. "One of the best answers I heard was from a commentator yesterday, saying, 'Leave it the way it is right now.' There have been very few problems. Leave it the way it is. North Carolina, what they're going through with all of the business that's leaving, all of the strife — and it's on both sides — you leave it the way it is. There have been very few complaints the way it is. People go, they use the bathroom that they feel is appropriate. There has been so little trouble. And the problem with North Carolina has been the strife and the economic punishment that they're taking."

Moments later, "Today" show host Matt Lauer posed a follow-up question: "So if Caitlyn Jenner were to walk into Trump Tower and want to use the bathroom, you would be fine with her using any bathroom she chooses?"

"That is correct," Trump said.

Weighing in on the Treasury's announcement on Wednesday that Harriet Tubman will replace Andrew Jackson on the $20 bill, Trump tried to please everyone.

"Well Andrew Jackson had a great history, and I think it's very rough when you take somebody off the bill," he said before adding in the next breath that "Harriet Tubman is fantastic."

"I would love to leave Andrew Jackson and see if we can maybe come up with another denomination" for Tubman, he said.

What about all those nasty things Trump has said about women, Muslims and Mexicans?, Lauer asked. "You can’t unsay those things," the host said.

"I’ve said some things in fun," Trump replied. "I’ve said it as an entertainer, doing the 'Apprentice.'"

This is Trump 2.0, which is actually something closer what the billionaire says he was before seeking the White House: A "world-class businessman" who "got along with everybody."

We've seen Trump attempt to pivot toward the general election before, but his inability to slam the door on Ted Cruz and John Kasich has forced him to remain focused on the Republican primary. Even now, after a landslide victory in his home state this week, a contested convention is still possible.

Trump and his new team of advisers have clearly calculated that he needs to make himself appear more electable in the general election -- both because he may soon get there and because he needs to win over skeptical delegates if the convention is contested. Making himself appear more electable is clearly in Trump's interest. And he's trying.