First draft of my changes for the RFID stuff.