Rapier Needs A bit Of Work