Developing Algebraic Thinking: using problem-solving to build from number and geometry in the primary school to the ideas thatunderpin algebra in high school and beyond