Added usb mount/unmount, ready for testing