updated todo; need to make some extra checks in drive options