beginning to extract executor logic :skull: