Implemented rest of expression parser.  Still needs to be fully tested.