Updates to demod, need to add op-amps next