Modified C container to more closely reflect the diagram. Added waveform slot.