Finished Tutorial 6

Updated with changes from tutorial 6 and imported/formatted example
code for changed files.