more cleanup to driver, added view code