adding usb/nfc/ enablers, maybe i can finish this tonight