Finish basic Tutorial rewrite