Organized TEM classes, closes #67