Complete API rethink.