Testing complete

Completed testing the improvements merge with the rfid reader.  All code works with new functionality.