Finished reworking all searches except sat