The Key Integration

Don't merge yet.