More work done, need to make sure conflicts are sound.