sewing up updated-- just have search left to fix