Further progress, need to test