Wildcard matching didn't work properly so I put a different implementation in there for now.