complete shift to using capture3 and much refactoring
bump to version 2