Initial work on using manifests