almost feature complete
Merge branch 'master' of github.com:jknowles/AppliedModelsTalk