commit work in progress for KMF