move into vars.
more fixup.