Hacking on hardware and lots of other changes