Massive changes, but still trying to get the searching to work