All Drive options in separate class.
Merge branch 'master' of https://github.com/satamas/DriveQuickstart