Converter refactored. All tests are green.