Renaming and new teaching function
Something new added.  And some stuff moved.