Initial integration of refactored api wrapper.