Wiring up with API
Resolving merge conflict, chose mine.