Finished Converting.  Need to update dynamicMatching method.