Wip
Basic structure in place
Basic conversion to codemodels done