prep for Assignment3
Seperate the 2 drivers
Fixing some wanings.