did some refactoring, improved save drive menu, and testing code for scalability