Moving Tagging to its own file