move to object to make more heuristics easier to right