@jklontz Proposed way to integrate - feel free to reverse commit.