Merged Sangdon's files in, fixed Search issue.