Got search more or less working, renamed a few things