Added antlr for expression parsing - work in progress