started to refactor action delegation