refactoring to support multiple forward targets

This change needs updates to our _d_.yml files to support the new structure.  This makes things more repetitive in those files unfortunately.