Continued work to simplify the ProcessAction call, also split it into