This looks good to merge once updated to use airplane mode. :+1: