Added some code for basic parser and scanner