Add/remove manifests, set create_group=true

Ready for a rebase fixup at a later stage