More work, some tests running, hopefully