Initial work on proper MakeDrive client API