added stupid searching
added slightly better searching