Rearranged some things to get ready for additional lessons