Fixed Merge Errors/ Rik !Class in class / Bob RFID Issues