Latest work.
Refactoring of API.