Updating files to include recent changes, and comment out component specific converters.  Working on inheritance for converters.