Client side APIs redo, 20140922-2