Enh: issue #688 / basic prep
Enh: Issue #688 / basic prep part 2
Enh: Issue #688 / basic prep

part 3
Enh: Issue #688 / add configuration option