Work on hardware ordering (adds extra options, makes it work)