Made progress on the test driver, not quite working yet.