Client side APIs redo, 20140919-2