Moving Search into a separate class