Merge just need to figure out the filter side bar