Part-way through merging early results work in.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
More merging of code

Signed-off-by: Joe Buck <jbbuck@gmail.com>