This is going to require a bunch of docs changes as you probably already know.