An evolution of CS:Box & Bit:Box to incorportate different elements of the UK Computing Curriculum