Early integration

Much of this will need to be redone, but this at least gives us history.