Cleaned up driver, created classifier