Need to implement a more gendralized search