rewrite evaluator; add deps to api