The Key Integration

Don't merge with master (yet).