I looked this over again and it adds the new forge stub but maintains the old - so this looks like what we want.  I'll fix spec.