Beginnings of conversion of code to new format interface.