Redesign of how CIEU propogation works