Added driver code, updated expression parsing and evaluation