Still trying to resolve issues with capture.
Updating unit tests.