move functions closer together
Add a isWildcard function
Beter test and isWildcard function
Remove some stuff