Add Colin's solutions