Almost there. 26/30 test cases running great!