Cleaning up based on some whiteboarding. Figured out clean way of having actions terminate.