Began refactorization of summary/statepoint to conform to API