Passes the first test
Some changes to the parser
Passes first test
Borrowed Wisse's parser to do evaluator. Evaluator passes all tests.