Fix the problem 1 and 2

Move the function template of "storm" from problem 1 to problem 2