Added Teacher model via generator
Re-merge the teacher branch