Additional Integration

For some reason, the full changes weren't in the last commit. This adds
the rest of the changes.