feature/convertor: Task complete including tests.