updating grammar to support assignment 4
finished adding required functions, beginning testing