WIP: Expand Manufacturer