Partial CIMPult Refactor