Incremental updates - getting basic structure right