Using a wrapper so we can test the drive!
Refactoring needed on the Library side. Will do that later