Two CD-Swap sections?
 

Alright, I've been letting it stew for a while, and I was thinking.

Suppose instead of the one big lump-o-stuff on the CD-Swap, the items were divided into two smaller lumps-o-stuff. One for robot-related parts, another for non-robot-but-still-FIRST-related parts (T-shirts, buttons, etc.)