Refactor to add in PlayerActionHandlers to eventHandlers