Moved drives out into a "reusable" component