Should we factor out that recurring spel/script infrastructure?