more updates, working on the more basic expressions