Expand tutorial and add exercise