Tried to make this version work, no good. Trying a new fix/branch.