more on the modeling
Merge branch 'master' of ssh://github.com/olittle/cata-rec