Near final version - testing for completeness.