good progress on one_shot and next event processing