Rapier code segregated from experimental