merge it in, i might plan on branching on this, and this version already works