Starting on factoring out intent resolution.