Jconnor 961875 inventoried custom metadata

NOT A REAL PULL REQUEST!!!

This exists so I can have a visual on where my conflicts are