untested key-value parser full class commit