Fixing Puzzles.sdf and exposing current puzzle as an object
Fixing merge conflicts