Working on various resolve step parts.