Finish teacher home
Merge branch 'hsy0130' into wip