This paper presents an enhanced time-domain modulated waveform measurement and engineering system. The measurement system is based around a standard sampling oscilloscope and consists of a test set which integrates both RF and IF measurement and engineering, merging the capabilities of DC, CW, and multi-tone measurement system. The aim of the system is to extend the design role of waveform measurement and engineering into the multi-tone domain allowing optimization of power amplifiers under more realistic operating conditions akin to those found in modern day wireless systems. A GaN transistor has been measured, and results are presented that highlight the capabilities and applications of the system.