Are the US and Iran moving closer to war?

Diplomacy continues despite the significant United States military build-up.