Rewrite to use a Coord object which automatically expands to 3D