initial refactor w/ new client

waiting on https://github.com/polyfills/es6-shorthands/issues/2