Refactore.
Merge branch 'new_api' into incoming