added basic tagging system