Adding driver car and other big changes