Client side APIs redo, 20140923-2