rewrote predicate parser, code not compiling
code compiling (with todos) after predicate switchover
Converted parsers to new representation