Further work, test harness added