Initial stages of driver rewrite