i would also have to remove the commented out tags tests below.

Not sure what to do with those yet.