Initial implementation with test driver scripts