Updated to API 2.0

Full pass over files to migrate entire library to API 2.0