grabbing changes from brad's fork
trying to fix camera hang by passing it in rather than starting it in the threads