Final refinements on the structure - fairly solid now.