Heavy re-write of manifests. Previously did not work as expected
Merge pull request #13 from myoung34/dev

Heavy re-write of manifests. Previously did not work as expected