Some structure and additions.