diff --git a/docs/components.md b/docs/components.md
index b3755d4..3396852 100644
--- a/docs/components.md
+++ b/docs/components.md
@@ -10,6 +10,7 @@
 - [Header](../src/components/Header//README.md)
 - [Input](../src/components/Input//README.md)
 - [InputDatePicker](../src/components/InputDatePicker//README.md)
+- [InputRadio](../src/components/InputRadio//README.md)
 - [InputSelect](../src/components/InputSelect//README.md)
 - [Nav](../src/components/Nav//README.md)
 - [QuickSearchForm](../src/components/QuickSearchForm//README.md)
diff --git a/src/components/InputRadio/PdapInputRadio.vue b/src/components/InputRadio/PdapInputRadio.vue
new file mode 100644
index 0000000..075538c
--- /dev/null
+++ b/src/components/InputRadio/PdapInputRadio.vue
@@ -0,0 +1,37 @@
+<template>
+	<div class="pdap-input pdap-input-radio">
+		<input
+			:id="id"
+			:name="name"
+			:defaultChecked="defaultChecked"
+			:value="value"
+			v-bind="$attrs"
+			type="radio"
+			@input="onInput"
+		/>
+
+		<label v-if="$slots.label" :for="id"><slot name="label" /></label>
+		<label v-else-if="label" :for="id">{{ label }}</label>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { inject, useSlots } from 'vue';
+import { PdapInputRadioProps } from './types';
+import { PdapFormProvideV2 } from '../FormV2/types';
+import { provideKey } from '../FormV2/util';
+
+const { label, name } = defineProps<PdapInputRadioProps>();
+const slots = useSlots();
+
+if (!slots.label && !label)
+	throw new Error(
+		'All form inputs must have a label, passed as a slot or a prop'
+	);
+
+const { setValues } = inject<PdapFormProvideV2>(provideKey)!;
+
+function onInput(e: Event) {
+	setValues({ [name]: (e.target as unknown as HTMLInputElement).value });
+}
+</script>
diff --git a/src/components/InputRadio/README.md b/src/components/InputRadio/README.md
new file mode 100644
index 0000000..7c1d9e4
--- /dev/null
+++ b/src/components/InputRadio/README.md
@@ -0,0 +1,53 @@
+# InputRadio
+Radio input. Designed to be wrapped with `RadioGroup`
+
+## Props - required
+
+| name             | required?                     | types     | description                                   | default |
+| ---------------- | ----------------------------- | --------- | --------------------------------------------- | ------- |
+| `defaultChecked` | no                            | `boolean` | radio is checked by default. Only 1 per group |         |
+| `id`             | yes                           | `string`  | id attr                                       |         |
+| `label`          | yes, if label slot not passed | `string`  | label content                                 |         |
+| `name`           | yes                           | `string`  | name attr                                     |         |
+
+## Slots
+
+| name    | required?                     | types     | description                          | default |
+| ------- | ----------------------------- | --------- | ------------------------------------ | ------- |
+| `label` | yes, if label prop not passed | `Element` | slot content to be rendered as label |         |
+
+## Example
+
+```vue
+<template>
+  <FormV2
+    id="form-id"
+    name="ice-cream-preference"
+    :schema="SCHEMA"
+    @submit="(values) => onSubmit({ values })"
+    @change="(values, event) => onChange({ values, event })"
+  >
+  <!-- Other inputs... -->
+    <RadioGroup :name="INPUT_RADIO_GROUP_NAME">
+      <h4 class="text-lg">
+        Select another flavor, with radio buttons this time!
+      </h4>
+      <InputRadio
+        v-for="{ label, value, defaultChecked } of ICE_CREAM_FLAVORS"
+        :id="value"
+        :key="label"
+        :default-checked="defaultChecked"
+        :name="INPUT_RADIO_GROUP_NAME"
+        :value="value"
+        :label="label"
+      />
+    </RadioGroup>
+  </FormV2>
+</template>
+
+<script setup>
+import { RadioGroup, InputRadio, FormV2 } from 'pdap-design-system';
+</script>
+
+...
+```
diff --git a/src/components/InputRadio/index.ts b/src/components/InputRadio/index.ts
new file mode 100644
index 0000000..e8e5c4c
--- /dev/null
+++ b/src/components/InputRadio/index.ts
@@ -0,0 +1 @@
+export { default as InputRadio } from './PdapInputRadio.vue';
diff --git a/src/components/InputRadio/input-radio.spec.ts b/src/components/InputRadio/input-radio.spec.ts
new file mode 100644
index 0000000..a7d00a2
--- /dev/null
+++ b/src/components/InputRadio/input-radio.spec.ts
@@ -0,0 +1,85 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { mount, VueWrapper } from '@vue/test-utils';
+import PdapInputRadio from './PdapInputRadio.vue';
+import { provideKey } from '../FormV2/util';
+import { ref } from 'vue';
+
+describe('PdapInputRadio', () => {
+	let wrapper: VueWrapper;
+	const mockSetValues = vi.fn();
+	const mockValues = ref({});
+	const mockV$ = ref({
+		testName: {
+			$error: false,
+			$errors: [],
+		},
+	});
+
+	const defaultProps = {
+		name: 'testName',
+		id: 'test-id',
+		label: 'Test Label',
+		value: 'test-value',
+	};
+
+	beforeEach(() => {
+		mockSetValues.mockClear();
+	});
+
+	const createWrapper = (props = {}, provide = {}, slots = {}) => {
+		return mount(PdapInputRadio, {
+			props: {
+				...defaultProps,
+				...props,
+			},
+			global: {
+				provide: {
+					[provideKey as symbol]: {
+						setValues: mockSetValues,
+						values: mockValues,
+						v$: mockV$,
+						...provide,
+					},
+				},
+			},
+			slots: { ...slots },
+		});
+	};
+
+	it('renders correctly with default props', () => {
+		wrapper = createWrapper();
+		expect(wrapper.find('input[type="radio"]').exists()).toBe(true);
+		expect(wrapper.find('label').text()).toBe('Test Label');
+	});
+
+	it('renders with slot label instead of prop label', () => {
+		wrapper = createWrapper(
+			{},
+			{},
+			{
+				label: '<span>Slot Label</span>',
+			}
+		);
+		expect(wrapper.find('label span').text()).toBe('Slot Label');
+	});
+
+	it('throws error when no label passed as slot or prop', async () => {
+		expect(() => {
+			wrapper = createWrapper({ label: undefined }, {}, {});
+		}).toThrow('All form inputs must have a label, passed as a slot or a prop');
+	});
+
+	it('emits input event and calls setValues when changed', async () => {
+		wrapper = createWrapper();
+		const input = wrapper.find('input');
+		await input.setValue(true);
+		expect(mockSetValues).toHaveBeenCalledWith({
+			[defaultProps.name]: defaultProps.value,
+		});
+	});
+
+	it('renders with defaultChecked prop', () => {
+		wrapper = createWrapper({ defaultChecked: true });
+		expect(wrapper.find('input').element.defaultChecked).toBe(true);
+	});
+});
diff --git a/src/components/InputRadio/types.ts b/src/components/InputRadio/types.ts
new file mode 100644
index 0000000..723264b
--- /dev/null
+++ b/src/components/InputRadio/types.ts
@@ -0,0 +1,7 @@
+export interface PdapInputRadioProps {
+	id: string;
+	label?: string;
+	name: string;
+	defaultChecked?: boolean;
+	value: string;
+}
diff --git a/src/components/InputRadioGroup/PdapInputRadioGroup.vue b/src/components/InputRadioGroup/PdapInputRadioGroup.vue
new file mode 100644
index 0000000..6362f0b
--- /dev/null
+++ b/src/components/InputRadioGroup/PdapInputRadioGroup.vue
@@ -0,0 +1,22 @@
+<template>
+	<div class="pdap-input-radio-group" :class="{ ['pdap-input-error']: error }">
+		<div v-if="$slots.error && error" class="pdap-input-error-message">
+			<slot name="error" />
+		</div>
+		<div v-else-if="error" class="pdap-input-error-message">{{ error }}</div>
+
+		<slot />
+	</div>
+</template>
+
+<script setup lang="ts">
+import { computed, inject } from 'vue';
+import { PdapFormProvideV2 } from '../FormV2/types';
+import { provideKey } from '../FormV2/util';
+
+const { name } = defineProps<{ name: string }>();
+
+const { v$ } = inject<PdapFormProvideV2>(provideKey)!;
+
+const error = computed(() => v$.value[name]?.$errors?.[0]?.$message);
+</script>
diff --git a/src/components/InputRadioGroup/index.ts b/src/components/InputRadioGroup/index.ts
new file mode 100644
index 0000000..0949494
--- /dev/null
+++ b/src/components/InputRadioGroup/index.ts
@@ -0,0 +1 @@
+export { default as RadioGroup } from './PdapInputRadioGroup.vue';
diff --git a/src/components/InputRadioGroup/input-radio-group.spec.ts b/src/components/InputRadioGroup/input-radio-group.spec.ts
new file mode 100644
index 0000000..95c2b4e
--- /dev/null
+++ b/src/components/InputRadioGroup/input-radio-group.spec.ts
@@ -0,0 +1,78 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { mount, VueWrapper } from '@vue/test-utils';
+import RadioGroup from './PdapInputRadioGroup.vue';
+import { provideKey } from '../FormV2/util';
+import { ref } from 'vue';
+
+describe('RadioGroup', () => {
+	let wrapper: VueWrapper;
+	const mockSetValues = vi.fn();
+	const mockValues = ref({});
+	const mockV$ = ref({
+		testName: {
+			$error: false,
+			$errors: [],
+		},
+	});
+
+	const defaultProps = {
+		name: 'testName',
+	};
+
+	beforeEach(() => {
+		mockSetValues.mockClear();
+	});
+
+	const createWrapper = (props = {}, slots = {}) => {
+		return mount(RadioGroup, {
+			props: {
+				...defaultProps,
+				...props,
+			},
+			slots,
+			global: {
+				provide: {
+					[provideKey as symbol]: {
+						setValues: mockSetValues,
+						values: mockValues,
+						v$: mockV$,
+					},
+				},
+			},
+		});
+	};
+
+	it('renders correctly with default props', () => {
+		wrapper = createWrapper();
+		expect(wrapper.find('.pdap-input-radio-group').exists()).toBe(true);
+	});
+
+	it('renders slot content', () => {
+		wrapper = createWrapper(
+			{},
+			{
+				default: '<div class="test-content">Test Content</div>',
+			}
+		);
+		expect(wrapper.find('.test-content').exists()).toBe(true);
+	});
+
+	it('shows error message when error exists', async () => {
+		mockV$.value.testName.$error = true;
+		// @ts-expect-error
+		mockV$.value.testName.$errors = [{ $message: 'Test error message' }];
+		wrapper = createWrapper();
+		expect(wrapper.find('.pdap-input-error').exists()).toBe(true);
+	});
+
+	it('shows custom error slot when provided and error exists', () => {
+		mockV$.value.testName.$error = true;
+		wrapper = createWrapper(
+			{},
+			{
+				error: '<div class="custom-error">Custom Error</div>',
+			}
+		);
+		expect(wrapper.find('.custom-error').exists()).toBe(true);
+	});
+});
diff --git a/src/components/InputSelect/PdapInputSelect.vue b/src/components/InputSelect/PdapInputSelect.vue
index 3fbfec5..bf4e548 100644
--- a/src/components/InputSelect/PdapInputSelect.vue
+++ b/src/components/InputSelect/PdapInputSelect.vue
@@ -39,7 +39,7 @@
 			/>
 
 			<div
-				v-else
+				v-if="!combobox"
 				class="selected-value"
 				:class="{ 'value-is-placeholder': !selectedOption }"
 			>
@@ -168,25 +168,55 @@ function handleClick() {
 	else toggleOpen();
 }
 
-function handleKeyDown(event: KeyboardEvent) {
-	if (event.key === 'Tab') {
-		if (
-			!event.shiftKey &&
-			focusedOptionIndex.value === filteredOptions.value.length - 1
-		) {
-			event.preventDefault();
-			return;
-		}
-
-		if (event.shiftKey && focusedOptionIndex.value === 0) {
-			event.preventDefault();
-			if (combobox) isOpen.value = false;
-			else closeAndReturnFocus();
-			return;
-		}
+// function handleKeyUp(event: KeyboardEvent) {
+// 	if (event.key === 'Tab') {
+// 		if (
+// 			!event.shiftKey &&
+// 			focusedOptionIndex.value === filteredOptions.value.length - 1
+// 		) {
+// 			event.preventDefault();
+// 			return;
+// 		}
+
+// 		if (event.shiftKey) {
+// 			if (isOpen.value) {
+// 				if (focusedOptionIndex.value === -1) {
+// 					isOpen.value = false;
+// 				}
+// 				if (focusedOptionIndex.value === 0) {
+// 					event.preventDefault();
+// 					closeAndReturnFocus();
+// 				} else {
+// 					event.preventDefault();
+// 					focusedOptionIndex.value = focusedOptionIndex.value - 1;
+// 				}
+
+// 				return;
+// 			}
+// 		}
+// 	}
+// }
 
-		return;
-	}
+function handleKeyDown(event: KeyboardEvent) {
+	// if (event.key === 'Tab') {
+	// 	if (
+	// 		!event.shiftKey &&
+	// 		focusedOptionIndex.value === filteredOptions.value.length - 1
+	// 	) {
+	// 		event.preventDefault();
+	// 		return;
+	// 	}
+
+	// 	if (event.shiftKey && focusedOptionIndex.value === 0) {
+	// 		event.preventDefault();
+	// 		closeAndReturnFocus();
+	// 	} else {
+	// 		event.preventDefault();
+	// 		focusedOptionIndex.value = focusedOptionIndex.value - 1;
+	// 	}
+
+	// 	return;
+	// }
 
 	if (!isOpen.value) {
 		if (['ArrowDown', 'ArrowUp', 'Enter'].includes(event.key)) {
diff --git a/src/demo/pages/FormV2Demo.vue b/src/demo/pages/FormV2Demo.vue
index 991ad50..2a71883 100644
--- a/src/demo/pages/FormV2Demo.vue
+++ b/src/demo/pages/FormV2Demo.vue
@@ -27,8 +27,6 @@
 				label="Type your password here"
 			/>
 
-			<p>Foo bar baz, extra content here</p>
-
 			<InputCheckbox
 				:id="INPUT_CHECKBOX_NAME"
 				:name="INPUT_CHECKBOX_NAME"
@@ -37,6 +35,7 @@
 
 			<InputSelect
 				:id="INPUT_SELECT_NAME"
+				combobox
 				:name="INPUT_SELECT_NAME"
 				:options="ICE_CREAM_FLAVORS"
 				placeholder="Select flavor"
@@ -53,6 +52,21 @@
 				</template>
 			</InputSelect>
 
+			<RadioGroup :name="INPUT_RADIO_GROUP_NAME">
+				<h4 class="text-lg">
+					Select another flavor, with radio buttons this time!
+				</h4>
+				<InputRadio
+					v-for="{ label, value, defaultChecked } of ICE_CREAM_FLAVORS"
+					:id="value"
+					:key="label"
+					:default-checked="defaultChecked"
+					:name="INPUT_RADIO_GROUP_NAME"
+					:value="value"
+					:label="label"
+				/>
+			</RadioGroup>
+
 			<InputDatePicker
 				:id="INPUT_DATE_NAME"
 				:name="INPUT_DATE_NAME"
@@ -82,6 +96,8 @@ import { InputText } from '../../components/InputText';
 import { InputCheckbox } from '../../components/InputCheckbox';
 import { InputPassword } from '../../components/InputPassword';
 import { InputSelect } from '../../components/InputSelect';
+import { InputRadio } from '../../components/InputRadio';
+import { RadioGroup } from '../../components/InputRadioGroup';
 import { InputDatePicker } from '../../components/InputDatePicker';
 import PdapInputTextArea from '../../components/InputTextArea/PdapInputTextArea.vue';
 
@@ -91,6 +107,7 @@ const INPUT_TEXT_NAME = 'first-name';
 const INPUT_DATE_NAME = 'date';
 const INPUT_PASSWORD_NAME = 'password';
 const INPUT_SELECT_NAME = 'flavors';
+const INPUT_RADIO_GROUP_NAME = 'flavors_2';
 const INPUT_TEXT_AREA_NAME = 'notes';
 
 const ICE_CREAM_FLAVORS = [
@@ -109,6 +126,7 @@ const ICE_CREAM_FLAVORS = [
 	{
 		value: 'rocky-road',
 		label: 'Rocky Road',
+		defaultChecked: true,
 	},
 	{
 		value: 'chunky-monkey',
@@ -150,6 +168,15 @@ const SCHEMA = [
 			},
 		},
 	},
+	{
+		name: INPUT_RADIO_GROUP_NAME,
+		validators: {
+			required: {
+				message: 'Please select your favorite flavor of ice cream. Again.',
+				value: true,
+			},
+		},
+	},
 	{
 		name: INPUT_DATE_NAME,
 		validators: {
diff --git a/src/directives/click-outside.ts b/src/directives/click-outside.ts
index 5f1c342..022c9e1 100644
--- a/src/directives/click-outside.ts
+++ b/src/directives/click-outside.ts
@@ -23,13 +23,11 @@ export default {
 		};
 
 		document.addEventListener('click', element.clickOutsideEvent);
-		document.addEventListener('keyup', element.clickOutsideEvent);
 	},
 	unmounted(element: ElementWithClickOutside) {
 		// Remove the event listener when the bound element is unmounted
 		if (element.clickOutsideEvent) {
 			document.removeEventListener('click', element.clickOutsideEvent);
-			document.removeEventListener('keyup', element.clickOutsideEvent);
 		}
 	},
 };
diff --git a/src/styles/components.css b/src/styles/components.css
index d9faad4..811a91c 100644
--- a/src/styles/components.css
+++ b/src/styles/components.css
@@ -37,8 +37,8 @@
 	}
 
 	/* Input styles  */
-	.pdap-input {
-		@apply h-[max-content] gap-1 leading-normal mb-3 w-full flex flex-col;
+	.pdap-input, .pdap-input-radio-group {
+		@apply h-[max-content] gap-1 leading-normal w-full flex flex-col;
 	}
 
 	.pdap-input input {
@@ -89,44 +89,54 @@
 	}
 
 	/* Specific inputs */
-	/* Input - checkbox */
-	.pdap-input-checkbox {
+	/* Input - checkbox and radio */
+	.pdap-input-checkbox,
+	.pdap-input-radio {
 		@apply border-2 border-transparent items-center gap-4 flex-row py-1 px-2 w-auto rounded-md;
 	}
 
 	.pdap-input-checkbox:has(input:checked),
-	.pdap-input-checkbox:has(input:checked):has(input[type="checkbox"]:focus) {
+	.pdap-input-radio:has(input:checked),
+	.pdap-input-checkbox:has(input:checked):has(input[type="checkbox"]:focus),
+	.pdap-input-radio:has(input:checked):has(input[type="checkbox"]:focus) {
 		@apply border-2 border-brand-gold border-solid rounded-md;
 	}
 
-	.pdap-input input[type='checkbox'] {
+	.pdap-input input[type='checkbox'], 
+	.pdap-input input[type='radio'] {
 		@apply h-6 w-6 accent-brand-gold;
 	}
 
-	.pdap-input input[type='checkbox'] ~ label {
+	.pdap-input input[type='checkbox'] ~ label,
+	.pdap-input input[type='radio'] ~ label {
 		@apply pl-0 w-full max-w-full;
 	}
 
 	.pdap-input input[type='checkbox'],
-	.pdap-input input[type='checkbox'] ~ label {
+	.pdap-input input[type='checkbox'] ~ label,
+	.pdap-input input[type='radio'],
+	.pdap-input input[type='radio'] ~ label {
 		@apply cursor-pointer;
 	}
 
 
-@media screen and (prefers-reduced-motion: reduce) {
-.pdap-input input:-webkit-autofill,
-  .pdap-input input:-webkit-autofill:focus {
-    transition: none !important;
-}
-}
-
-	.pdap-input input:-webkit-autofill,
-  .pdap-input input:-webkit-autofill:focus {
-    transition: background-color 0s 600000s, color 0s 600000s !important;
-  }
-
+	
 	/* Text area */
 	.pdap-input textarea {
-	  @apply text-lg;
+		@apply text-lg;
+	}
+
+
+	/* Hacky stuff to get around ugly chrome and ff autofill styles */
+	@media screen and (prefers-reduced-motion: reduce) {
+	.pdap-input input:-webkit-autofill,
+		.pdap-input input:-webkit-autofill:focus {
+			transition: none !important;
+	}
 	}
+	
+		.pdap-input input:-webkit-autofill,
+		.pdap-input input:-webkit-autofill:focus {
+			transition: background-color 0s 600000s, color 0s 600000s !important;
+		}
 }
\ No newline at end of file