Work in progress for Callidus