My integration work

Hoping this PR makes sense, it was a pain to make happen :)