Working on the v10 rewrite.