Adding PuzzleType class; partly done