@Prototik let me know if you feel like working on this convertor block. Makes sense to merge that change regardless though.