That is just about right, except the line running from the DCC board to top of motor is Orange not yellow. If you want to use the existing light in the Athearn unit, most decoders will work if you tie the white wire to the back of the light, at the copper strip that normally rests on top of the truck, and not tie the blue wire to any point. (that applies to single function decoders such as the Lenz LE1000W, which are as cheap as $12 plus shipping):thumb: