Puzzle safety and organization