Add initial implementation of new state resolution algorithm