feature/convertor-module - interim commit