Version 2 made with a more consistent dataset from version 1.
Testing in progress. Gonna leave v1 up for now.
Using this to build a larger and more consistent dataset.
