Working to make parser pass.
Forgot these files.