added basic tagging functionality