More moving around for organization and flesh out retry logic in the multi action controller.