Work on structure, add heatplate check