Ive thought about just doing a case swap and upgrading what i can but that dosent really seem worth doing. Also yes what i mostly have is optiplex-like systems. I have found some with a i7 on the other hand, the best machine i found came with a i7 and a 4vram nvidia card. Im mostly lost on what online marketplaces to list on.