PROBCORE-557 Migrating Evaluation commands (and a bit of refactoring in there too)