Finished up tutorial with improved scaffolding