Add solution and testing