added rudimentary operator parsing