It lives! 22 tests failed
Fixed comments, now onwards line tracking