Solution for Problem #2

Also adding "in_one_minute" for timeout testing.