Just the initial work, will need more changes.

Reviewed-by: tbell

Reviewed-by: ohair, ddehaven