[wip] port eval packages and refactor