initial commit to device-safe