Starting refactor to build custom manifest