more progress on new puzzle solver