New integration pt2

Includes mainly header changes