Teasing apart manifests and adding specs.{