Experimental changes that make the ForceStagePoint code use regex