Add a much richer set of sampling tools to the command line