Sync our progress with your branch

Move this out side the comment block.