Looks like it's finally something that is ready for the tree. The first patch basically just takes what I had before and puts it in with ComputerSystemIndication, then the second patch does some actual integration work.