Add preliminary code to allow unscheduled sampling