Adding initial optional work. Update template