Bug Fixes. Initial pass Implementation of Manifest. Refactor of other code to use Manifest. Bug fixes.