More work on the custom actions.