Rework logic to not require the "action" keyword