Almost ready for regression testing