Solution is fixed, now need to implement Puzzle