Commit for review. Work in progress.