WIP: More work on calculator - can supply variables.