diff --git a/src/App.vue b/src/App.vue
index 2048030..5c1b4b3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,12 +36,13 @@
 	<main>
 		<section id="timer">
 			<Status ref="statusRef"/>
-			<!--<Timer 
-				v-if="categories.length > 0"
+			<Timer 
+				v-if="currentWorkingInstrument"
 				@loggedTime="refreshPage"
-				:categories="categories"
 				:instruments="instruments"
-				:currentWorkingCategory="currentWorkingCategory"/>-->
+				:categories="categories"
+				v-model:currentWorkingInstrument="currentWorkingInstrument"
+				v-model:currentWorkingCategory="currentWorkingCategory"/>
 		</section>
 		<section id="summary">
 			<Summary 
diff --git a/src/components/timer.vue b/src/components/timer.vue
index c4b0bcb..7a93d74 100644
--- a/src/components/timer.vue
+++ b/src/components/timer.vue
@@ -1,10 +1,14 @@
-<script lang="ts">
+<script setup>
+	const currentWorkingCategory = defineModel('currentWorkingCategory')
+	const currentWorkingInstrument = defineModel('currentWorkingInstrument')
+	const props = defineProps(['categories', 'instruments'])
+</script>
+<script>
 	import axios from 'axios';
 	import CategoryChooser from './category_chooser.vue'
 	import { getHours, getMinutes, createTimeObj, getAccumulatedSeconds, formatSeconds } from '../libs/time.js'
 
 	export default {
-		props: ['categories', 'currentWorkingCategory', 'instruments'],
 		data() {
 			return {
 				running: false,
@@ -186,8 +190,8 @@
 
 		<label>Practice Category</label>
 		<CategoryChooser
-			@update="handleCategoryChange"
-			:currentWorkingCategory="currentWorkingCategory"
+			v-model:currentWorkingCategory="currentWorkingCategory"
+			v-model:currentWorkingInstrument="currentWorkingInstrument"
 			:instruments="instruments"
 			:categories="categories" />
 		<input type="Submit"/>