Keycards

Merge in changes required to use RFID cards,