Parser almost working - need to fix term and simpleExpression