Fixing Eval.hs and starting to redo the parser