Refactored manifests

* Almost every method covered on manifest now
* Refactored to better faciliatate refactored environment
* All manifest tests pass!