More work on various models.
Merge branch 'master' of https://github.com/rcythr/P5T