New models

Models done
I don't know if we'll have such a generic routine.