Continued splitting of SamplingTool. Continue working in SamplePointGenerator tomorrow...