Pushing the latest changes to the grammar.

Function calling works. I'm currently trying to investigate why a variable isn't being added to the main function scope.