Converted to be a package
Better way of scanning for tags