Support for tags

watch can now have tags