Client side API re-do, 20140916