Added card search TODO