Moved parsing calls to an interpreter, some functionality works. Added minor error handling in grammar (currently leaks memory). Changed some lexer rules in tandem.