This may have been overkill on my part.
All of my engines have decoders in them.
The Double Headed units are consisted in JMRI.
This was under the consist tab in JMRI.
Each consist is given their own address.
Even my 4 unit passenger consist is one address.
This makes life much easier.