Still need to clamp to a square, sigh.