All code ported. Comp(arison/lex) tests still fail