initial commit w/ drive overide