Added (now untested) expression parsing (uuuuh...)