Kilrah/588 hardware settings

Merge the base in next so that we can branch off it again to implement different items separately