Basic conversion to codemodels done