Made a few working comments
Need to add a search spec