Updated to follow the standard Aim/Challenge/Extra Credit/Notes format