Working on searchRoom and done dumb test
Merging errors, some more to fix
Merging errors fixed