WIP ImageCalculator migration