Snapshot of state after pr2
Merge branch 'master' of github.com:x3-university/MT