doug/singlestate

single state behavior