Nits which made links not work at all.
Switched back to arrays of Supplier class objects.
Not implemented.