Rearranged tutorial 7 so that it works correctly.