Adjusted files to match tutorial's more closely.
Adjusted files to match tutorial's code