WIP: Clearer SPI/Factory pattern.
WIP: Clearer SPI/Factory pattern.