Integrated API w/ searchscene. See you all tomorrow.
fixed conflicts