Bring over features from Mac version