Progress on Driver class