Merging in. Basic features complete.