New tagging system and updated readme