catalog:  wildcard expansion

Todo:  The same things as the previous update, plus the wildcard
expansion should actually return the wildcards.  There are better ways
to do this, so we might want to do that.