Rename vars for consistency.
Add expression parser.