Issue 830: initial commit

Reviewed existing classes and removed puzzle.