Order functions, add NetSwitchAdapter

It's a redundancy tester now