Intermediate commit: parser is coming along, but we are running to into type issues.
Types now check out in parser, preparing to test