added problem as a member of State and removed heuristic. Fixed all other code accordingly