Started work on expression parsing