paultag/feature/eval

First shot at this.