Added drive class. Needs testing.