A batch of more moving the model to the IDM
Merge branch 'master' of github.com:matzew/IDM-tests