Finished the conversion to use the 2.2 API might need some work