Summary: Just the initial work, will need more changes.
Reviewed-by: tbell