Prepping to refactor Factory-like scripts.