Beginning of a series of updates for multi-target

These changes accommodate the ability for the system to generate
multiple targets at one time.