Added search feature back to Connor's commit. Style is a bit weird tho.