Added more work on expression parsing