Now using Shunting Yard algorithm for expression parsing