For #125, Refactored code, using handlers instead of explicit calls. This gets rid of all collection module code from drive