Push object creation into factory module and CLI script (mostly)