Completed ini example. Don't merge before !23 (merged). Small unrelated change slipped in to this branch, will need to fix that first.