Added solver skeleton