Fix
Template
factory
Script
Add non-virtual run

To eventually replace run_generic