Initial code for resolve on states, related to #1