Integration

I think we're ready to merge these in.