Integrate

This brings the other 2 PR's on base together in one PR. #18 and #15