integration refactoring

We lose the immutability of this object...