I snipe used USFF ultra small form factor machines off eBay...nice being able to eventually scale into new upgrades, swap out original i3's, for i5 or i7 when I see good deals.
Although my main PC, the mechanical keyboard started to have issues...parts just arrived today so I can repair it \0/ glad I'm not roped into some laptop to try to maintain again.