Wip 7553

For initial review.