#101 refactoring of capture - untested so far.