got most tests passing, ready for last step