Complete rewrite and switch to gulper