Add mostly working drive and follow code