Get rid of an ugly static class.
Get rid of an ugly static class.
Add the keyName for the initial index.
fix the tests.