Consolidated first version of puzzle model.