Client side API redo, 20140916-2