Merge pull request #4 from Apelon-VA/master

Rework the type / classifier mechanism, so that the classifier can
Merge pull request #5 from Apelon-VA/master

pushing sprint work to gold