More factory configuration.  Still WIP.