Added main module elements to grammar and a few unit tests
Started working on expression support in the grammar