Slight refactoring
More refactoring
Working wildcards