Revert "Revert "Add iCiBa Expression""

This reverts commit 3b5c70a557a64aad7e5c9d74c3b224953f6c96ea.