Began the conversion to new datatypes