Finish wiring up the new API