New Puzzle Model + new views