CP: Parser rewrite. Builds but not functional yet.