Further work on Drive (WIP).