Add evaluator
Refactoring with ZipList
Add todo and test functions