took out wildcard hack, added actual implementation