Added some of the teaching framework