Work in progress to update ConvertToExtensions...